Make make check happier

diff --git a/ChangeLog b/ChangeLog
index 1e9a8dde1d0b04cff49e653f9589f783616a1816..7a51226be5475a1652c72a4f2500fbb7a72eb2a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/abicheck.sh: Use uniq to filter out duplicates.
+       * gdk/gdk.symbols: Fix a define.
+
 2005-06-14  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_parse_geometry):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1e9a8dde1d0b04cff49e653f9589f783616a1816..7a51226be5475a1652c72a4f2500fbb7a72eb2a3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/abicheck.sh: Use uniq to filter out duplicates.
+       * gdk/gdk.symbols: Fix a define.
+
 2005-06-14  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_parse_geometry):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1e9a8dde1d0b04cff49e653f9589f783616a1816..7a51226be5475a1652c72a4f2500fbb7a72eb2a3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/abicheck.sh: Use uniq to filter out duplicates.
+       * gdk/gdk.symbols: Fix a define.
+
 2005-06-14  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_parse_geometry):

diff --git a/gdk/abicheck.sh b/gdk/abicheck.sh
index c03f9302ba3fd97691a5c1ead4d8ef3afd6cde8f..9164f1d3ea69d8d7010aaf33f2a8d8dcc5caf53b 100755 (executable)
--- a/gdk/abicheck.sh
+++ b/gdk/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort > expected-abi
+cpp -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
 nm -D .libs/libgdk-x11-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 73fc0bd396ddb162d2d443368e897baf126c3376..5f5b1c01614c145fdd94fbca9276b1f19868b24a 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -612,7 +612,7 @@ gdk_gc_get_screen
 
 #if IN_HEADER(__GDK_PIXMAP_X11_H__)
 #if IN_FILE(__GDK_PIXMAP_X11_C__)
-#ifdef GDK_PIXMAPING_X11
+#ifdef GDK_WINDOWING_X11
 gdk_pixmap_impl_x11_get_type G_GNUC_CONST
 #endif
 #endif